Simpler library handling. PKGBUILD+release, lto.

diff --git a/build/archlinux/PKGBUILD b/build/archlinux/PKGBUILD
index 6e87dc6e51514e0ac12fb3dec3691c10495342b6..48e6eae79f13804b3dad2e3a506c19bb02b4ef57 100644 (file)
--- a/build/archlinux/PKGBUILD
+++ b/build/archlinux/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=babl-meson-git
 _pkgname=babl
-pkgver=0.1.38.14.g9677c79
+pkgver=0.1.38.17.gf50bef7
 pkgrel=1
 pkgdesc="babl is a dynamic, any to any, pixel format translation library."
 arch=('i686' 'x86_64')
@@ -27,6 +27,8 @@ build() {
     meson "${srcdir}/${_gitname}"\
           "${srcdir}/build" \
         --prefix=/usr \
+        -Dbuildtype=release \
+        -Db_lto=true \
         -Dwith-docs=false
 
     ninja -C "${srcdir}/build"
@@ -40,3 +42,7 @@ pkgver() {
     cd "${_gitname}"
     git describe --always | sed -e 's/BABL_//g' -e 's/[_-]/./g'
 }
+
+check() {
+    meson test -C "${srcdir}/build"
+}    

diff --git a/meson.build b/meson.build
index 9d330ede13b405e1d16451db553ef337200af013..ffd6b53e11e98bcff8efdbb067e5599464e475a3 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -197,21 +197,10 @@ w3m          = find_program('w3m', required: false)
 ################################################################################
 # Dependencies
 
-if os_win32
-  math = []
-  thread = []
-else
-  math = cc.find_library('m')
-  thread  = cc.find_library('pthread')
-endif
-
-if platform_android
-  log = cc.find_library('log')
-else
-  log = []
-endif
-
-dl = cc.find_library('dl')
+math  = cc.find_library('m',       required: false)
+thread= cc.find_library('pthread', required: false)
+log   = cc.find_library('log',     required: false)
+dl    = cc.find_library('dl',      required: false)
 
 
 pkgconfig.generate(filebase: 'babl',